From: Luka Perkov <luka@openwrt.org>
Date: Thu, 2 May 2013 00:49:05 +0000 (+0000)
Subject: tinc: fix init.d/tinc parameter generation and logfile config name
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=0a38d98a7d99cd8b0e087c489a11fddf932eab16;p=openwrt%2Fsvn-archive%2Fpackages.git

tinc: fix init.d/tinc parameter generation and logfile config name

tinc expects long parameters to be in the form "--name=value" and the
current init scripts generate "--name value" parameters. See `tincd
--help` to confirm. Also, the config/tinc and init.d/tinc incorrectly
use the parameter "log" when it should be "logfile".

Signed-off-by: Sandy McArthur, Jr. <Sandy@McArthur.org>

SVN-Revision: 36508
---

diff --git a/net/tinc/files/tinc.config b/net/tinc/files/tinc.config
index f9f2b53f8..18940781a 100644
--- a/net/tinc/files/tinc.config
+++ b/net/tinc/files/tinc.config
@@ -4,7 +4,7 @@ config tinc-net NETNAME
 	## Daemon Configuration	(cmd arguments)
 	#option generate_keys 0
 	#option key_size 2048
-	#option log /tmp/log/tinc.NETNAME.log
+	#option logfile /tmp/log/tinc.NETNAME.log
 	#option debug 3
 
 	## Server Configuration (tinc.conf)
diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index 9ab1bd00c..b24bc682e 100644
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -42,7 +42,7 @@ append_params() {
 		config_get v "$s" "$p"
 		IFS="$LIST_SEP"
 		for v in $v; do
-			[ -n "$v" ] && append_param "$p" && ARGS="$ARGS $v"
+			[ -n "$v" ] && append_param "$p" && ARGS="$ARGS=$v"
 		done
 		unset IFS
 	done
@@ -169,7 +169,7 @@ start_instance() {
 	ARGS=""
 
 	# append params
-	append_params "$s" log debug
+	append_params "$s" logfile debug
 
 	SERVICE_PID_FILE="/var/run/tinc.$s.pid"
 	service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE"